Complex forms in miniLcm #1061
Complex forms in miniLcm #1061
Conversation
# Conflicts: # backend/FwLite/LcmCrdt/CrdtMiniLcmApi.cs
… can translate that into a join/sub query for filtering
| } | ||
|
|
||
| [Fact] | ||
| public async Task CreateEntry_WithComponentSenseDoesNotShowOnComplexFormsList() |
There was a problem hiding this comment.
| public async Task CreateEntry_WithComponentSenseDoesNotShowOnComplexFormsList() | |
| public async Task CreateEntry_WithComponentSenseDoesNotShowOnEntryComplexFormsList() |
| @@ -15,22 +16,25 @@ namespace FwDataMiniLcmBridge.Api; | |||
|
|
|||
| public class FwDataMiniLcmApi(Lazy<LcmCache> cacheLazy, bool onCloseSave, ILogger<FwDataMiniLcmApi> logger, FwDataProject project) : IMiniLcmApi, IDisposable | |||
| { | |||
| private LcmCache Cache => cacheLazy.Value; | |||
| public LcmCache Cache => cacheLazy.Value; | |||
There was a problem hiding this comment.
Would InternalsVisibleTo be more appropriate?
| Senses = entry.AllSenses.Select(FromLexSense).ToList(), | ||
| ComplexFormTypes = ToComplexFormType(entry), | ||
| Components = ToComplexFormComponents(entry), | ||
| //todo, this does not include complex forms which reference a sense |
There was a problem hiding this comment.
I can't remember what you said about this TODO. Is it tricky? Can we not just put this on Sense:
ComplexForms = [..sense.ComplexFormEntries.Select(complexEntry => ToSenseReference(sense, complexEntry))]
| }; | ||
| } | ||
|
|
||
| private IList<ComplexFormType> ToComplexFormType(ILexEntry entry) |
There was a problem hiding this comment.
| private IList<ComplexFormType> ToComplexFormType(ILexEntry entry) | |
| private IList<ComplexFormType> ToComplexFormTypes(ILexEntry entry) |
| crdtEntries.Should().BeEquivalentTo(fwdataEntries, | ||
| options => options | ||
| .For(e => e.Components).Exclude(c => c.Id) | ||
| .For(e => e.Components).Exclude(c => c.ComponentHeadword) |
There was a problem hiding this comment.
This is due to the fact that we don't yet ever change the headword on components or complex forms in CRDTs?
| { | ||
| entity.ComplexFormTypes = | ||
| [ | ||
| ..entity.ComplexFormTypes.Where(t => t.Id != OldComplexFormTypeId), |
There was a problem hiding this comment.
The current plan is to eventually use a sort-order field for persisting sorting, right?
| { | ||
| if (ComplexFormEntryId.HasValue) | ||
| { | ||
| entity.ComplexFormEntryId = ComplexFormEntryId.Value; |
There was a problem hiding this comment.
Don't we need to update headwords here? We could presumably pull them out of the context.
Or are you just ignoring them, because we don't know how to update them when the headword of a referenced entry changes?
| //could optimize this by doing a single query, but this is easier to read | ||
| entry.Components = [..await ComplexFormComponents.Where(c => c.ComplexFormEntryId == id).ToListAsyncEF()]; | ||
| entry.ComplexForms = [..await ComplexFormComponents.Where(c => c.ComponentEntryId == id).ToListAsyncEF()]; |
There was a problem hiding this comment.
This seems like a pretty small legibility sacrifice to make for a whole db query 🤷
| //could optimize this by doing a single query, but this is easier to read | |
| entry.Components = [..await ComplexFormComponents.Where(c => c.ComplexFormEntryId == id).ToListAsyncEF()]; | |
| entry.ComplexForms = [..await ComplexFormComponents.Where(c => c.ComponentEntryId == id).ToListAsyncEF()]; | |
| var complexFormComponents = await ComplexFormComponents.Where(c => c.ComplexFormEntryId == id || c.ComponentEntryId == id).ToListAsyncEF(); | |
| entry.Components = [..complexFormComponents.Where(c => c.ComplexFormEntryId == id)]; | |
| entry.ComplexForms = [..complexFormComponents .Where(c => c.ComponentEntryId == id)]; |
| /// <summary> | ||
| /// Contains a definition for an entry | ||
| /// This is a CRDT object | ||
| /// </summary> |
There was a problem hiding this comment.
This comment is kind of random.
| @@ -1,5 +1,8 @@ | |||
| namespace MiniLcm.Models; | |||
|
|
|||
| /// <summary> | |||
| /// Contains a definition for an entry | |||
| /// </summary> | |||
this is just a first pass at what Complex Forms might look like. I'd like to get some input on how well this models complex forms and what might be missing